Small fixes and changes for QOL