[FIXED] Misc bugs