Merge in nekosune's changes