little bugfixes
TicketBuilder Pattern
fix merge conflict dev-oli