Fixing small bugs noticed today