Some frontend fixes