Fixes for 13.10