fixes with strict typing