Fixes

Fixed some minor bugs