Fixing build warnings (in progress)