Small fixes, deleted debug lines