Small level changes and fixes