Last fucktorations for 0.4.0