Dev framework fixes