FIX: Here and there fixes