Fix variable stuff