guardian + fixes for rest