Code

Some fixes for trunk from 2.5