Prepare angular for minif. + minor fixes