Smoothed out some issues with build