Fixed issues with Build Path