Additional fixes and options