Code

Moved fixes to trunk