Jgarcia/fixes with manual testing