Misc. changes

…Sorry about the mix