Small fixes(damn them)