Some tweaks and fixmes