Some more fixes and updates