Removed all warnings and fixed builder