Small fixes

A list of fixes