Fix/trivial

very basic fixes