Miscellanceous fixes
Fixed some minor details