Misc. changes from testing