Small fixes;
Temp commit;