Minor Update and Compile