Small bugfixes
Unessary changes