Minor fixes

add last trunk files