Fixes for Angular compatibility