Minor fixes, pushed for client feedback