Fixing some typing (i miss strong typing!)