Fixes for 3