Various fixes (for #50 and respec warning)