Further frontend fixes

Fix #11