Added some compiler checks