Updates to (hopefully) filter out some conflicting/spurious build requests from Eclipse