Minor changes and stuff