Fixes minor flaws