Added recent fixes that were pushed to frys