Fix a few levelup related issues