Fixes for nahlen and started nancy