Added missing files, fixed up warnings