Misc changes (mainly constant additions)