Fixes, added FIXMEs