Merged fixes
Working with defs
.511
.520
.527
Minor fixes on .527