General fixes

Just fixing bugs