Fixing more functionality