Fixes Build Issues