Fixes and more fixes