some basic fixes after merging