Fix some syntax errors

Fix some syntax errors and get rid of wildcards imports which can hide errors (e.g. d98fdb0)