Fix buggy include guard and small updates