Fixed some warnings, edited intents according to new standard