Fixes for majutsu and fcppt