More fixes! Now the rest is for Homes :D
New build xD