Fixes for 258 and 279