Small Bug Fixes

Gonna keep track of these bugs one day