Fix some derpiness