ticket:26 Small fixes