Updated various pieces of code to comply with what is in production