[master] Fixed some stuff