Fix for stupid small bugs