Fixes for Build