Minor fixes for make errors