Few more fixes/cleanup