Compylr updates
Bug fixes
Minor fixes