Added compile fix suggestions from Ariel