Fixes, more fixes, even more fixes