Small fixes

Going to do some heavy testing later today, as plenty of methods could
be broken at the moment.
Will fix any broken ones as soon as possible!