Fixing noob mistakes