Fixing some angular dependency issues