Resolved compile/build problems