some small fixes after merging