Fix some issues

Fix some issues from fronenders