Fixing more bugs
Fixed forgotten