[FIX] Minor fixes, really minors