Some small bug fixes

@shirioko You may not want c2c75f179570945f8efbc87e7c75fdee4c1667ee  so feel free to change that back, but the rest of them should fix https://github.com/venomous0x/WhatsAPI/issues/560