Fixes for bugses