Fixes and fillers

fixes and fillers for 1.8.1